diff --git a/BoardConfig.mk b/BoardConfig.mk
index 4332fd0..d318cd9 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -56,3 +56,9 @@
 BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := squashfs
 endif
 endif
+
+ifeq ($(TARGET_KERNEL_USE_4_1), true)
+TARGET_PREBUILT_KERNEL := device/linaro/hikey-kernel/Image-4.1
+TARGET_PREBUILT_DTB := device/linaro/hikey-kernel/hi6220-hikey.dtb-4.1
+TARGET_FSTAB := fstab.hikey-4.1
+endif
diff --git a/device.mk b/device.mk
index 15a21c0..0729249 100644
--- a/device.mk
+++ b/device.mk
@@ -20,14 +20,16 @@
 ifeq ($(TARGET_PREBUILT_KERNEL),)
 LOCAL_KERNEL := device/linaro/hikey-kernel/Image
 LOCAL_DTB := device/linaro/hikey-kernel/hi6220-hikey.dtb
+LOCAL_FSTAB := fstab.hikey
 else
 LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
 LOCAL_DTB := $(TARGET_PREBUILT_DTB)
+LOCAL_FSTAB := $(TARGET_FSTAB)
 endif
 
 PRODUCT_COPY_FILES +=   $(LOCAL_KERNEL):kernel \
                         $(LOCAL_DTB):hi6220-hikey.dtb \
-			$(LOCAL_PATH)/fstab.hikey:root/fstab.hikey \
+			$(LOCAL_PATH)/$(LOCAL_FSTAB):root/fstab.hikey \
 			$(LOCAL_PATH)/init.hikey.rc:root/init.hikey.rc \
 			$(LOCAL_PATH)/init.hikey.usb.rc:root/init.hikey.usb.rc \
 			$(LOCAL_PATH)/ueventd.hikey.rc:root/ueventd.hikey.rc \